Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 31 Jan 2007 10:44:21 +0000 (10:44 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 31 Jan 2007 10:44:21 +0000 (10:44 +0000)

Trivial merge